managementContext: incorporate review comments