Made Java 1.6 compatible (Edited Diamond Op)