Deriving referenced as a local dependency.
Rewrote handlers to introduce shell.