Parameters validation added