ops: migrate more ops to macro based api