Added key policy class and its objects watchers