Tweaked how class is exported