Refactor to load both sets using queue