Updating parser and base templates