changes due to api refactoring