More additions to the shell architecture.