Adjust imports