Fixing with JSON api and entity datamodel.