One more validation check and improving the documentation