Some metadata added to HP parts
Syntax in HP parts fixed, use include in multi-part components