Add dump procedure still to improve