Code changes for adding instance name and missing instance types