Expose some more modules