Changed fields order and separate contact details and address in 2 distinct schematas