Re-add distribution management part for testing.