Re-factored the glance storage dispatcher