Updated to latest library develop branch

Changes reflect more normalized storage of scopes.