Better handling for config data
Simplify event creation