Updated entity broker for v1.9.2