Use validate, add some warning suppression