Minor change to prevent a couple of unnecessary imports. Grouped extensions to reduce number of future changes and prevent inconsistencies.