Added more jpeg support