Add support for by-class instance tracking
v0.4.0