Updated to work with hbro v1.1.0.0.