Expose more options