Changed <> to follow Java7 std