Validation Improvments