Updated configuration forms