[TASK] Improve staging procedure and feedback