Removed the diamond operators to make it compatible with java 6