Added return/add methods for choices and illustrations to conform to our Model definition
Updated to use Fragment's new methods