added image service, updated data model