Let timemachine be more generic