Added image switch support