Added Label to address model & minor changes