Feature/instance config