Updated with event feature