Add Bhaa public and admin classes