Add choice support
version bump