Function Parser Improvement