added semi-functional .zip file support and shortened handler names