Convert other managers to generic.

Needs some debugging