Major security improvements