Added support for png and gif