Improved address schema.