Fine tuned import logic,modified edmx