Made source code compatible with JDK 1.5 (no diamond operator).