Major API change and usage simplification