Moved Track to internal class