Added specific user support in for workers and cleaned up program flow control.