Annotations for storage

Refs #838