Make settings more generic