Added id to field and updated various bits of code to reflect this