More validation work