Changes to support bluetooth bee (address and UUID)