added :store-name support