Make fields an object