Use Java7 diamond syntax