Refactored config classes
Option to allow Defaults to have different names