Common entity introduced.
Archive entity instead of removal.
Merge branch 'feature/validations'