Include storage subclasses in flared.cc