Better track creation