Improve support tracking