Add support for crypt-service