Made imports more consistent