Added counter management