Add support for 'then' syntax
Add support for 'group' syntax