Added support for custom stores