Added status checks