Add address to entities and fix relationships