Added telephone constraint handling