Pull request for new validate features