Some more complex code changes due to new way to setup the client and propertycollectors
Move away from the services model and fix all resulting errors