Moved fields out into attributes