Working on issue #1506
Closes issue #1506 and also make XML not directly accessable
Added event trigger default data