More work on validation