Factories, timestamps and some method renaming