Added crypto support