Added some advanced setup