Added utility methods to help when building queries and entities