Add support for operation retrieval