Updated doc and validator