RDoc comments added and one more validation added