Adds pluggable custom tags
Merge branch 'pluggableTags'