Added enhance.xml and use it, adding events now work