Updated snapshot version of sdp-shared
Minor refactorings