Removed Generics - apparentally we compile with source 1.4