[FEATURE] Refactor Validation service