Improve restore/complete mechanism