Trying to reduce number of 3rd party modules through re-export