Expose more things