Added link detection and validations