Moved policy objects, added STS support