Config spec refactoring