Added more fiels