First pass of updates to the hybrid code for reading the new config type