Make advanced mode optional