Security manager changes