Major changes to Backend EF Code and refactoring of Logic Codes