Image mapper added
Added mappers and abstracted to factories
Added mappers and abstracted to factories