Use Map instead of Hash, fix image getter/setter