Making intantiotor type independent