Altered Parser functions