Should have been part of the earlier restructure commit