Moved Image, added dictionary handler