Improved function reuse
Added support for dump