Security and syntax improvements