Add better find spec