Merged with parser library