Added new structure for ops. Variant is ported in.