Added standard advance options and dataserver choice