Use diamond operator for Java 7