Fix store interface