Simple validation added