Added classes to differentiate shared and private resources.
Small changes and resolved the tags issue.

Looks like the tags provided with entity additional information method are no longer objects, introduced a fix for that.