More updates to address refactor