Security re-factoring.