Add :on-dispose