KD: Added finders to enteties