Refactored database method name and added EntityNotFoundException