Moved functionality to Manager from Unit Manager