Added Improved Option Setters