Extend image attachment capability to more models