Removed Exporter and use vars, use our instead