Added label event support