Modified config to reflect new plans
Extract config validation/loading, load retrofit requirements