Updated to support findGUID