Expose more functions to modify/override