Fixed/Added configurations