Updated to support brand selection