Updates to models and added questions