Add choices. Change optional attribute. Fix callable functions.