Attempting to fix the issues of EF