Crypt Interface restructure