*Config: Improved config