Updated grammar and visitor - added timer properties