#63 added diamond syntax where applicable