Structure change
refactor
SHELL-1 secure domain preference setting