The tooling of SP mapping with EF 6x is great. Please migrate it over to EF code so it can be easier for developer.