Changed to be able to use crp-task-client and crp-task-producer-client

Hopefully did sufficient testing, but it works on my machine.