Added support for legacy syntaxes