Disaster class became smarter