Change config format to use a class instance