Adding services as an additional step when building Fingerprint and Query commands. This is done in order to remove dependencies upon service locator. The implementation will be much easier to use. Client should not be aware of Service locator by any means.