Encapsulated track adding and skipping
Added counter by extension