Issue #15 Break the responsibility of the manager class