Rearrange the imports a little for more generality