Updated genconfig to accomodate new config structure