Additional checks in place