Started refactoring Collectors. Previous timestamp caching = faster!