Implemented new error validation logic, using bitwise operations
Removed useless import
Refactored the end of the EditEntity logic.
Merge branch 'feature/bitwise-errors' into develop