checkbox: Refactoring API