Added method findById