Improved content type tracking