Issue #24: Towards a proper API