Changed models and mapping to match json