Switched over to use validation lib.