Changed header to use module imports