Some updates for module exports