Improved syntax definition, but still needs work

Change-Id: Idae491b65f72c9bfef1dc25e0ad9b6475078793b