Changes to support dynamic types in XAppify