Added status checking for table