Improved usage end points (#209)