Added source to adresses class and working hierarchy