[SATYR PATCHv2 5/9] Add type-agnostic API