Oops, these should be directly on config