Added more tracking support