Integrate broker system#91

Fix #91