Added createdAt and updatedAt fields