+1 for keeping a specific class, optional inheriting from the one that makes most sense.