added type and timestamp fields