1 part of privite api refactoring