Add proper fire class