added `choices` group
fixed missing new lines at the end of files