Added image handling