Added policies refactored code

Change-Id: I156cd5f8773c02b27e33355797df8fa02c11151b