Adjust to code structure.