Rearanged tables and added fields