Add experimental config options and support