added new options and fixed the address format