Address format fix and added entrance