Added more prefix fields