Removed diamond operator for 1.6 compliance