Switched storage model to list of pairs
Tweaked storage containers