Refactor initializing empty data stores
Refactor data dict building