Added required checks