Update Webcirc2 Models

Made changes to the models according to the current schema on Confluence
Merged with fhaynes