Updated Parser Expressions