Moved subkey and subkey_only to be per instance rather then Global settings