Added more variant support.