Added experminental syntax support, improved parser