Updated models according to current schema