Update grammar to support diamonds