Add additional checks to make sure we don't load the same data twice