Refactoring. Hide non api methods