Permissions cleanup
Beginning of DMS support