config and config generator changes