Updates to modeling classes and db context