Add defaults to storage vars in map