Refactoring due changes in ycnetapi