Issue 6: Add initial support for sub events