Added Title/Description/Short_Description/@id/@idref to key constructs. Updated