Changed method to search by Id, design choice