Changes to library - no more string parsing