Work a bit on xml event subscribers + builder