API improvements (visibility, refactoring, access)