Incorporate review comments: ManagementContext tracks locations