refactoring to new interface structure
documentation stub