Fixed diamond operators not supported with jdk 6.