Added more functionality in dump_computed