Added choices and other_field