Add volatile storage support
Formatting issue yet again!