Basic validation added