Adding basic choice mapping and updating some methods and signatures