Added full support for brands