Updated parsing with new library