Compatability with Java 1.6 by removing diamond<> operators