Add support for manual command and event retrieval