Added: More checks