Added more track functionality