Improve crypt interfaces