Updated imports to fix Travis breakage