Add basic handling of configuration state