Add uid and acknowledged fields from alarm extension draft