Some validation added