Added config options from l3