changed event names
added templated property