Added support for many new keys on Tracks