Added appropriate fields