Reorganize validation

Add some material in skeleton