Added crypto part