Make zt-zip require Java 1.5
Add generics to collections