Made changes to reflect model and use changes.