Address detection added