improved service handling
better crypto / credentials support