Updates to top-level program to reflect stage wrapper classes