Added InstanceIdentifier to code generation