Added support for tracks