Move to final common refactor