Adding in options framework capability.