Fix importing issues and config formating