Reduced the amount of information necessary to setup model and added the ability to reference both the query and model from a list item