Added additional configurations