Added new features and new syntaxes