Store factory has been improved.