added support for new syntax