Opt for LinkedHashMap and update config