Class enhancement