Added town and modify noble_estate and district fields