Merge "Add Sub Attribute parsing capabilit"