Added addresses support