Changed Repository to have fields for api return data