Decouple holder from underlying invtype