Removing PrimaryKey module and adding timestamp format