Completing broadcast for from main use only. Adding support to be updated from queue and run as daemon