added addresses table and combined it with users