Add closer and storage