Add distribution configuration
Port to new value refs