extended unit status
unit server refactoring