Image handling added