Started to implement the new options.