Moved EntityNotFoundException
Adapted to new stores version