Added more block events for editing