Added choices, modified models