Add support for stores