part of zmp-daemon refactoring