Advanced Options added and tested.

#refs 1204