Add BB variables compatibility