Added jpg and png support