Additional changes for new refactor