Removing importer code
Adding else directive and some options