Better option versioning