Enhanced configuration