Fix #1 - Proper definition of public API