Bug changes and brand API

Bug changes and brand API