improve store registry