Augmented FindWait class to extract data member information