Add support for 'then' syntax