Reuse improvements