[PLAT-6250] Make fee support more general - allow other instruments to be supported