Added right validation