db entities inmprovements v2