Adding a generic config system