Updated validator and underscore