Added @timestamp attributes to versioned constructs
Switched APT1 and PIVY to use TermsOfUse Marking