Adding extra level of validation