Updated delimiters and others