Redo lift and add create, tracing hooks