Reworked the added fields