Implementing own parser for addresses
General improvements.