Added ability to use Tags within Composites
Minor Fixes, Refactoring
Merge remote-tracking branch 'remotes/MainBranch-rrix/master'