Added zooming support