Avoid encode/decode silliness
Add basis for event filtering