Add support for white-labeling
Add support for white-labeling