Added image toggle support