Changes to adjust with refactored ManagerFactory.

Issue: BMS-176, BMS-148
Reviewer: Rebecca