Added additional checks