Updated db models