Improve the validations over the older add work validations