Issue #6: Settings API revised