Placing configuration opts back