Add states 'Resolved' and stage 'Cleanup'