Using createEntity and initializers where possible