Added case with Choice-case to instance identifier building