Refactor Choose Card API