Move security back into domain