Added new class for wait info