Add viewEvents support