Added dependency
Added tapenter and tapleave events