Added covers and better track update handling