Added ability  to not close the original data container