Updated Comment manager integrate with the comment cache
Added unique properties to some of the schema and small refactoring