Wip: Add support of Dry Run (With Flo comments)