Adding trackType and trackType handling