Changed ModelNotFoundException to EntityNotFoundException