Removed branding in functions and make them dynamic by using static vars

Improved class with several fixes to brand the support framework.