Changed use of diamond operator (not supported in 1.6)