Fixed error expanding
Fixed ExternalModule virtual id manipulation