Refactors for changes to library