Changed id generator to time based