Changed services to be more servicey, change ImageEntity class.