Option Framework Changes Updated