Add class-or-instance idiom