Got the change of scope types into a working state.