Minor API Refactor