Additional checks added