Make auto-identify better