Further work on validate server