Draft of improved address class and address parsing