Make yaml settings more generic