Removed use of person
Added map for static addresses