Add AddTS func so the timestamp can be set
Unify puppet collectors so only one init is needed