Enhanced classes