Added choice and select to InfoDB