Expose more classes