Changes to ReferenceType and Demo