Improved branding support