Removed generics which block usage of Java 1.6.