Added findByid feature