Annotations for shell

Refs #838