+ defaultStoreName removed