Added query support for Stores