Added zoom support