Modify account-manager by new design