More work on validator