Added some required checks