Update to include changes from https://code.google.com/p/ns-api/