Merged in refactor changes