Fix generators to prepend timestamp