KRACOEUS-7051: fix awry declarations, add entity scanning