Added most configuration