Add basic expire structure
Add initial support to expire events