Modified library functions for new parser.