Configuration improved