Added basic syntax features