Added content importer and removed GF and Maps