Expose more API