MB-19
api refactoring