FIX: storage now initialized by config value