Changed from entity to model