move to more sensible configuration syntax