Added custom form type for Address
Redrew chart to make it clearer