Ported Manager changes.