Implement findById
Augment the timeout