Included timestamping, updated signatures