Better existence check