A bit API refactoring