Bring back configurability in expert mode