Current Database model updated