* Provide additional validation for entities * Refactor * Create test for NoXssValidator * Refactor dependencies