Added location to the store calls