Adding support for imports with single quotes