Updated for BBUI 0.9.6