Add ImageFactory
merge