Refactored builders and store queue.