Changes made to models to handle auth issues.

https://catami.atlassian.net/browse/CAT-551