Minor improvement in IMS class