Parser updated, more libraries converted