Fixed findOrCreate Bug, restored timeout