Fixed the instance delegate lookup
Updated the way the package mapping is done in EMF support generator