Refactoring + Manage other assembly