Update store specific code.
Merge pull request #444 from gsn/master

Update store specific code.