Move id up and added fields