added entity object to store all data from api
changed methods to use object