Add choice functionality