Added Image File support