Added id finding