Stores have been refactored. Transaction control and unit tests have been improved.