Updated imports to allow inline imports.