Variables validation added