Enhance entity, field && querybuilder classes