Added image handling for getAll()