diff --git a/src/main/java/staffconnect/logic/Messages.java b/src/main/java/staffconnect/logic/Messages.java
index 237754bf0e1..7e6639ea5ac 100644
--- a/src/main/java/staffconnect/logic/Messages.java
+++ b/src/main/java/staffconnect/logic/Messages.java
@@ -40,6 +40,8 @@ public static String format(Person person) {
                 .append("; Phone: ")
                 .append(person.getPhone())
                 .append("; Email: ")
+                .append(person.getFaculty())
+                .append("; Faculty: ")
                 .append(person.getEmail())
                 .append("; Venue: ")
                 .append(person.getVenue())
diff --git a/src/main/java/staffconnect/logic/commands/AddCommand.java b/src/main/java/staffconnect/logic/commands/AddCommand.java
index e89a8a8ad1a..b0e72105f48 100644
--- a/src/main/java/staffconnect/logic/commands/AddCommand.java
+++ b/src/main/java/staffconnect/logic/commands/AddCommand.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -26,6 +27,7 @@ public class AddCommand extends Command {
             + PREFIX_NAME + "NAME "
             + PREFIX_PHONE + "PHONE "
             + PREFIX_EMAIL + "EMAIL "
+            + PREFIX_FACULTY + "FACULTY "
             + PREFIX_VENUE + "VENUE "
             + PREFIX_MODULE + "MODULE "
             + "[" + PREFIX_TAG + "TAG]...\n"
@@ -33,6 +35,7 @@ public class AddCommand extends Command {
             + PREFIX_NAME + "John Doe "
             + PREFIX_PHONE + "98765432 "
             + PREFIX_EMAIL + "johnd@example.com "
+            + PREFIX_FACULTY + "Computing "
             + PREFIX_VENUE + "311, Clementi Ave 2, #02-25 "
             + PREFIX_MODULE + "CS2103 "
             + PREFIX_TAG + "friends "
diff --git a/src/main/java/staffconnect/logic/commands/EditCommand.java b/src/main/java/staffconnect/logic/commands/EditCommand.java
index a2a253942d1..ee47549c189 100644
--- a/src/main/java/staffconnect/logic/commands/EditCommand.java
+++ b/src/main/java/staffconnect/logic/commands/EditCommand.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -23,6 +24,7 @@
 import staffconnect.logic.commands.exceptions.CommandException;
 import staffconnect.model.Model;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -44,6 +46,7 @@ public class EditCommand extends Command {
             + "[" + PREFIX_NAME + "NAME] "
             + "[" + PREFIX_PHONE + "PHONE] "
             + "[" + PREFIX_EMAIL + "EMAIL] "
+            + "[" + PREFIX_FACULTY + "FACULTY] "
             + "[" + PREFIX_VENUE + "VENUE] "
             + "[" + PREFIX_MODULE + "MODULE] "
             + "[" + PREFIX_TAG + "TAG]...\n"
@@ -101,11 +104,13 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Name updatedName = editPersonDescriptor.getName().orElse(personToEdit.getName());
         Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
         Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
+        Faculty updatedFaculty = editPersonDescriptor.getFaculty().orElse(personToEdit.getFaculty());
         Venue updatedVenue = editPersonDescriptor.getVenue().orElse(personToEdit.getVenue());
         Module updatedModule = editPersonDescriptor.getModule().orElse(personToEdit.getModule());
         Set<Tag> updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
 
-        return new Person(updatedName, updatedPhone, updatedEmail, updatedVenue, updatedModule, updatedTags);
+        return new Person(updatedName, updatedPhone, updatedEmail, updatedFaculty,
+                updatedVenue, updatedModule, updatedTags);
     }
 
     @Override
@@ -140,6 +145,7 @@ public static class EditPersonDescriptor {
         private Name name;
         private Phone phone;
         private Email email;
+        private Faculty faculty;
         private Venue venue;
         private Module module;
         private Set<Tag> tags;
@@ -154,6 +160,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
             setName(toCopy.name);
             setPhone(toCopy.phone);
             setEmail(toCopy.email);
+            setFaculty(toCopy.faculty);
             setVenue(toCopy.venue);
             setModule(toCopy.module);
             setTags(toCopy.tags);
@@ -163,7 +170,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) {
          * Returns true if at least one field is edited.
          */
         public boolean isAnyFieldEdited() {
-            return CollectionUtil.isAnyNonNull(name, phone, email, venue, module, tags);
+            return CollectionUtil.isAnyNonNull(name, phone, email, faculty, venue, module, tags);
         }
 
         public void setName(Name name) {
@@ -190,6 +197,14 @@ public Optional<Email> getEmail() {
             return Optional.ofNullable(email);
         }
 
+        public void setFaculty(Faculty faculty) {
+            this.faculty = faculty;
+        }
+
+        public Optional<Faculty> getFaculty() {
+            return Optional.ofNullable(faculty);
+        }
+
         public void setVenue(Venue venue) {
             this.venue = venue;
         }
@@ -238,6 +253,7 @@ public boolean equals(Object other) {
             return Objects.equals(name, otherEditPersonDescriptor.name)
                     && Objects.equals(phone, otherEditPersonDescriptor.phone)
                     && Objects.equals(email, otherEditPersonDescriptor.email)
+                    && Objects.equals(faculty, otherEditPersonDescriptor.faculty)
                     && Objects.equals(venue, otherEditPersonDescriptor.venue)
                     && Objects.equals(module, otherEditPersonDescriptor.module)
                     && Objects.equals(tags, otherEditPersonDescriptor.tags);
@@ -249,6 +265,7 @@ public String toString() {
                     .add("name", name)
                     .add("phone", phone)
                     .add("email", email)
+                    .add("faculty", faculty)
                     .add("venue", venue)
                     .add("module", module)
                     .add("tags", tags)
diff --git a/src/main/java/staffconnect/logic/parser/AddCommandParser.java b/src/main/java/staffconnect/logic/parser/AddCommandParser.java
index 3b8bf5a2f62..660065236d4 100644
--- a/src/main/java/staffconnect/logic/parser/AddCommandParser.java
+++ b/src/main/java/staffconnect/logic/parser/AddCommandParser.java
@@ -2,6 +2,7 @@
 
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -14,6 +15,7 @@
 import staffconnect.logic.commands.AddCommand;
 import staffconnect.logic.parser.exceptions.ParseException;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -33,23 +35,24 @@ public class AddCommandParser implements Parser<AddCommand> {
      */
     public AddCommand parse(String args) throws ParseException {
         ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE,
-                PREFIX_EMAIL, PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG);
+                PREFIX_EMAIL, PREFIX_FACULTY, PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG);
 
-        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_VENUE, PREFIX_MODULE)
-                || !argMultimap.getPreamble().isEmpty()) {
+        if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
+                PREFIX_VENUE, PREFIX_MODULE) || !argMultimap.getPreamble().isEmpty()) {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
             PREFIX_VENUE, PREFIX_MODULE);
         Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
         Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
         Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
         Venue venue = ParserUtil.parseVenue(argMultimap.getValue(PREFIX_VENUE).get());
+        Faculty faculty = ParserUtil.parseFaculty(argMultimap.getValue(PREFIX_FACULTY).get());
         Module module = ParserUtil.parseModule(argMultimap.getValue(PREFIX_MODULE).get());
         Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
 
-        Person person = new Person(name, phone, email, venue, module, tagList);
+        Person person = new Person(name, phone, email, faculty, venue, module, tagList);
 
         return new AddCommand(person);
     }
diff --git a/src/main/java/staffconnect/logic/parser/CliSyntax.java b/src/main/java/staffconnect/logic/parser/CliSyntax.java
index 9493ab188e5..9676d720b05 100644
--- a/src/main/java/staffconnect/logic/parser/CliSyntax.java
+++ b/src/main/java/staffconnect/logic/parser/CliSyntax.java
@@ -9,6 +9,7 @@ public class CliSyntax {
     public static final Prefix PREFIX_NAME = new Prefix("n/");
     public static final Prefix PREFIX_PHONE = new Prefix("p/");
     public static final Prefix PREFIX_EMAIL = new Prefix("e/");
+    public static final Prefix PREFIX_FACULTY = new Prefix("f/");
     public static final Prefix PREFIX_VENUE = new Prefix("v/");
     public static final Prefix PREFIX_MODULE = new Prefix("m/");
     public static final Prefix PREFIX_TAG = new Prefix("t/");
diff --git a/src/main/java/staffconnect/logic/parser/EditCommandParser.java b/src/main/java/staffconnect/logic/parser/EditCommandParser.java
index 3249935c101..e24b767e6c0 100644
--- a/src/main/java/staffconnect/logic/parser/EditCommandParser.java
+++ b/src/main/java/staffconnect/logic/parser/EditCommandParser.java
@@ -3,6 +3,7 @@
 import static java.util.Objects.requireNonNull;
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -33,7 +34,7 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         requireNonNull(args);
         ArgumentMultimap argMultimap =
-                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
                     PREFIX_VENUE, PREFIX_MODULE, PREFIX_TAG);
 
         Index index;
@@ -44,7 +45,7 @@ public EditCommand parse(String args) throws ParseException {
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
         }
 
-        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL,
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
                 PREFIX_VENUE, PREFIX_MODULE);
 
         EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
@@ -58,6 +59,9 @@ public EditCommand parse(String args) throws ParseException {
         if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
             editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
         }
+        if (argMultimap.getValue(PREFIX_FACULTY).isPresent()) {
+            editPersonDescriptor.setFaculty(ParserUtil.parseFaculty(argMultimap.getValue(PREFIX_FACULTY).get()));
+        }
         if (argMultimap.getValue(PREFIX_VENUE).isPresent()) {
             editPersonDescriptor.setVenue(ParserUtil.parseVenue(argMultimap.getValue(PREFIX_VENUE).get()));
         }
diff --git a/src/main/java/staffconnect/logic/parser/ParserUtil.java b/src/main/java/staffconnect/logic/parser/ParserUtil.java
index 454061da8b3..eae100013dd 100644
--- a/src/main/java/staffconnect/logic/parser/ParserUtil.java
+++ b/src/main/java/staffconnect/logic/parser/ParserUtil.java
@@ -10,6 +10,7 @@
 import staffconnect.commons.util.StringUtil;
 import staffconnect.logic.parser.exceptions.ParseException;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Phone;
@@ -81,6 +82,21 @@ public static Email parseEmail(String email) throws ParseException {
         return new Email(trimmedEmail);
     }
 
+    /**
+     * Parses a {@code String faculty} into an {@code Faculty}.
+     * Leading and trailing whitespaces will be trimmed.
+     *
+     * @throws ParseException if the given {@code faculty} is invalid.
+     */
+    public static Faculty parseFaculty(String faculty) throws ParseException {
+        requireNonNull(faculty);
+        String trimmedFaculty = faculty.trim();
+        if (!Faculty.isValidFaculty(trimmedFaculty)) {
+            throw new ParseException(Faculty.MESSAGE_CONSTRAINTS);
+        }
+        return new Faculty(trimmedFaculty);
+    }
+
     /**
      * Parses a {@code String venue} into an {@code Venue}.
      * Leading and trailing whitespaces will be trimmed.
diff --git a/src/main/java/staffconnect/model/person/Person.java b/src/main/java/staffconnect/model/person/Person.java
index 5c10209078e..a445c35b4a2 100644
--- a/src/main/java/staffconnect/model/person/Person.java
+++ b/src/main/java/staffconnect/model/person/Person.java
@@ -20,6 +20,7 @@ public class Person {
     private final Name name;
     private final Phone phone;
     private final Email email;
+    private final Faculty faculty;
 
     // Data fields
     private final Venue venue;
@@ -29,11 +30,12 @@ public class Person {
     /**
      * Every field must be present and not null.
      */
-    public Person(Name name, Phone phone, Email email, Venue venue, Module module, Set<Tag> tags) {
-        requireAllNonNull(name, phone, email, venue, module, tags);
+    public Person(Name name, Phone phone, Email email, Faculty faculty, Venue venue, Module module, Set<Tag> tags) {
+        requireAllNonNull(name, phone, email, faculty, venue, module, tags);
         this.name = name;
         this.phone = phone;
         this.email = email;
+        this.faculty = faculty;
         this.venue = venue;
         this.module = module;
         this.tags.addAll(tags);
@@ -51,6 +53,10 @@ public Email getEmail() {
         return email;
     }
 
+    public Faculty getFaculty() {
+        return faculty;
+    }
+
     public Venue getVenue() {
         return venue;
     }
@@ -99,6 +105,7 @@ public boolean equals(Object other) {
         return name.equals(otherPerson.name)
                 && phone.equals(otherPerson.phone)
                 && email.equals(otherPerson.email)
+                && faculty.equals(otherPerson.faculty)
                 && venue.equals(otherPerson.venue)
                 && module.equals(otherPerson.module)
                 && tags.equals(otherPerson.tags);
@@ -107,7 +114,7 @@ public boolean equals(Object other) {
     @Override
     public int hashCode() {
         // use this method for custom fields hashing instead of implementing your own
-        return Objects.hash(name, phone, email, venue, module, tags);
+        return Objects.hash(name, phone, email, faculty, venue, module, tags);
     }
 
     @Override
@@ -116,6 +123,7 @@ public String toString() {
                 .add("name", name)
                 .add("phone", phone)
                 .add("email", email)
+                .add("faculty", faculty)
                 .add("venue", venue)
                 .add("module", module)
                 .add("tags", tags)
diff --git a/src/main/java/staffconnect/model/util/SampleDataUtil.java b/src/main/java/staffconnect/model/util/SampleDataUtil.java
index 1befd734f31..88ab2d5edc9 100644
--- a/src/main/java/staffconnect/model/util/SampleDataUtil.java
+++ b/src/main/java/staffconnect/model/util/SampleDataUtil.java
@@ -7,6 +7,7 @@
 import staffconnect.model.ReadOnlyStaffBook;
 import staffconnect.model.StaffBook;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -19,25 +20,37 @@
  */
 public class SampleDataUtil {
     public static Person[] getSamplePersons() {
-        return new Person[] {
+        return new Person[]{
             new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
-                new Venue("Blk 30 Geylang Street 29, #06-40"), new Module("CS1101S"),
-                getTagSet("professor")),
+                    new Faculty("Computing"),
+                    new Venue("Blk 30 Geylang Street 29, #06-40"),
+                    new Module("CS1101S"),
+                    getTagSet("professor")),
             new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
-                new Venue("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), new Module("CS1231S"),
-                getTagSet("tutor", "friends")),
+                    new Faculty("Computing"),
+                    new Venue("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
+                    new Module("CS1231S"),
+                    getTagSet("tutor", "friends")),
             new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
-                new Venue("Blk 11 Ang Mo Kio Street 74, #11-04"), new Module("CS2030S"),
-                getTagSet("professor")),
+                    new Faculty("Computing"),
+                    new Venue("Blk 11 Ang Mo Kio Street 74, #11-04"),
+                    new Module("CS2030S"),
+                    getTagSet("professor")),
             new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
-                new Venue("Blk 436 Serangoon Gardens Street 26, #16-43"), new Module("CS2040S"),
-                getTagSet("professor")),
+                    new Faculty("Computing"),
+                    new Venue("Blk 436 Serangoon Gardens Street 26, #16-43"),
+                    new Module("CS2040S"),
+                    getTagSet("professor")),
             new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
-                new Venue("Blk 47 Tampines Street 20, #17-35"), new Module("CS2100"),
-                getTagSet("tutor")),
+                    new Faculty("Computing"),
+                    new Venue("Blk 47 Tampines Street 20, #17-35"),
+                    new Module("CS2100"),
+                    getTagSet("tutor")),
             new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
-                new Venue("Blk 45 Aljunied Street 85, #11-31"), new Module("CS2101"),
-                getTagSet("professor"))
+                    new Faculty("Computing"),
+                    new Venue("Blk 45 Aljunied Street 85, #11-31"),
+                    new Module("CS2101"),
+                    getTagSet("professor"))
         };
     }
 
diff --git a/src/main/java/staffconnect/storage/JsonAdaptedPerson.java b/src/main/java/staffconnect/storage/JsonAdaptedPerson.java
index 600299c7a12..557ebc407ce 100644
--- a/src/main/java/staffconnect/storage/JsonAdaptedPerson.java
+++ b/src/main/java/staffconnect/storage/JsonAdaptedPerson.java
@@ -11,6 +11,7 @@
 
 import staffconnect.commons.exceptions.IllegalValueException;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -28,6 +29,7 @@ class JsonAdaptedPerson {
     private final String name;
     private final String phone;
     private final String email;
+    private final String faculty;
     private final String venue;
     private final String module;
     private final List<JsonAdaptedTag> tags = new ArrayList<>();
@@ -37,11 +39,13 @@ class JsonAdaptedPerson {
      */
     @JsonCreator
     public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
-            @JsonProperty("email") String email, @JsonProperty("venue") String venue,
-            @JsonProperty("module") String module, @JsonProperty("tags") List<JsonAdaptedTag> tags) {
+                             @JsonProperty("email") String email, @JsonProperty("faculty") String faculty,
+                             @JsonProperty("venue") String venue, @JsonProperty("module") String module,
+                             @JsonProperty("tags") List<JsonAdaptedTag> tags) {
         this.name = name;
         this.phone = phone;
         this.email = email;
+        this.faculty = faculty;
         this.venue = venue;
         this.module = module;
         if (tags != null) {
@@ -56,6 +60,7 @@ public JsonAdaptedPerson(Person source) {
         name = source.getName().fullName;
         phone = source.getPhone().value;
         email = source.getEmail().value;
+        faculty = source.getFaculty().toString();
         venue = source.getVenue().value;
         module = source.getModule().value;
         tags.addAll(source.getTags().stream()
@@ -98,6 +103,15 @@ public Person toModelType() throws IllegalValueException {
         }
         final Email modelEmail = new Email(email);
 
+        if (faculty == null) {
+            throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+                    Faculty.class.getSimpleName()));
+        }
+        if (!Faculty.isValidFaculty(faculty)) {
+            throw new IllegalValueException(Faculty.MESSAGE_CONSTRAINTS);
+        }
+        final Faculty modelFaculty = new Faculty(faculty);
+
         if (venue == null) {
             throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Venue.class.getSimpleName()));
         }
@@ -115,7 +129,7 @@ public Person toModelType() throws IllegalValueException {
         final Module modelModule = new Module(module);
 
         final Set<Tag> modelTags = new HashSet<>(personTags);
-        return new Person(modelName, modelPhone, modelEmail, modelVenue, modelModule, modelTags);
+        return new Person(modelName, modelPhone, modelEmail, modelFaculty, modelVenue, modelModule, modelTags);
     }
 
 }
diff --git a/src/main/java/staffconnect/ui/PersonCard.java b/src/main/java/staffconnect/ui/PersonCard.java
index f93f79e7476..62a7fdb51e5 100644
--- a/src/main/java/staffconnect/ui/PersonCard.java
+++ b/src/main/java/staffconnect/ui/PersonCard.java
@@ -37,6 +37,8 @@ public class PersonCard extends UiPart<Region> {
     @FXML
     private Label venue;
     @FXML
+    private Label faculty;
+    @FXML
     private Label module;
     @FXML
     private Label email;
@@ -52,6 +54,7 @@ public PersonCard(Person person, int displayedIndex) {
         id.setText(displayedIndex + ". ");
         name.setText(person.getName().fullName);
         phone.setText(person.getPhone().value);
+        faculty.setText(person.getFaculty().toString());
         venue.setText(person.getVenue().value);
         module.setText(person.getModule().value);
         email.setText(person.getEmail().value);
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
index 2101c6c5ed9..2eaa73653dc 100644
--- a/src/main/resources/view/PersonListCard.fxml
+++ b/src/main/resources/view/PersonListCard.fxml
@@ -29,6 +29,7 @@
       </HBox>
       <FlowPane fx:id="tags" />
       <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
+      <Label fx:id="faculty" styleClass="cell_small_label" text="\$faculty" />
       <Label fx:id="venue" styleClass="cell_small_label" text="\$venue" />
       <Label fx:id="module" styleClass="cell_small_label" text="\$module" />
       <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
diff --git a/src/test/data/JsonSerializableStaffBookTest/duplicatePersonStaffBook.json b/src/test/data/JsonSerializableStaffBookTest/duplicatePersonStaffBook.json
index 952b4bd598b..64644892641 100644
--- a/src/test/data/JsonSerializableStaffBookTest/duplicatePersonStaffBook.json
+++ b/src/test/data/JsonSerializableStaffBookTest/duplicatePersonStaffBook.json
@@ -3,6 +3,7 @@
     "name": "Alice Pauline",
     "phone": "94351253",
     "email": "alice@example.com",
+    "faculty": "Computing",
     "venue": "123, Jurong West Ave 6, #08-111",
     "module": "CS1101S",
     "tags": [ "friends" ]
@@ -10,6 +11,7 @@
     "name": "Alice Pauline",
     "phone": "94351253",
     "email": "pauline@example.com",
+    "faculty": "Computing",
     "venue": "4th street",
     "module": "CS1231S"
   } ]
diff --git a/src/test/data/JsonSerializableStaffBookTest/invalidPersonStaffBook.json b/src/test/data/JsonSerializableStaffBookTest/invalidPersonStaffBook.json
index f46f149ffd8..ae959a0639e 100644
--- a/src/test/data/JsonSerializableStaffBookTest/invalidPersonStaffBook.json
+++ b/src/test/data/JsonSerializableStaffBookTest/invalidPersonStaffBook.json
@@ -3,6 +3,7 @@
     "name": "Hans Muster",
     "phone": "9482424",
     "email": "invalid@email!3e",
+    "faculty": "Computing",
     "venue": "4th street",
     "module": "CS2030S"
   } ]
diff --git a/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json b/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json
index 4c7a7b4ba6d..8138a59c4a9 100644
--- a/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json
+++ b/src/test/data/JsonSerializableStaffBookTest/typicalPersonsStaffBook.json
@@ -4,6 +4,7 @@
     "name" : "Alice Pauline",
     "phone" : "94351253",
     "email" : "alice@example.com",
+    "faculty": "Computing",
     "venue" : "123, Jurong West Ave 6, #08-111",
     "module": "CS1101S",
     "tags" : [ "friends" ]
@@ -11,6 +12,7 @@
     "name" : "Benson Meier",
     "phone" : "98765432",
     "email" : "johnd@example.com",
+    "faculty": "Computing",
     "venue" : "311, Clementi Ave 2, #02-25",
     "module": "CS1231S",
     "tags" : [ "owesMoney", "friends" ]
@@ -18,6 +20,7 @@
     "name" : "Carl Kurz",
     "phone" : "95352563",
     "email" : "heinz@example.com",
+    "faculty": "Computing",
     "venue" : "wall street",
     "module": "CS2030S",
     "tags" : [ ]
@@ -25,6 +28,7 @@
     "name" : "Daniel Meier",
     "phone" : "87652533",
     "email" : "cornelia@example.com",
+    "faculty": "Computing",
     "venue" : "10th street",
     "module": "CS2040S",
     "tags" : [ "friends" ]
@@ -32,6 +36,7 @@
     "name" : "Elle Meyer",
     "phone" : "9482224",
     "email" : "werner@example.com",
+    "faculty": "Computing",
     "venue" : "michegan ave",
     "module": "CS2100",
     "tags" : [ ]
@@ -39,6 +44,7 @@
     "name" : "Fiona Kunz",
     "phone" : "9482427",
     "email" : "lydia@example.com",
+    "faculty": "Computing",
     "venue" : "little tokyo",
     "module": "CS2101",
     "tags" : [ ]
@@ -46,6 +52,7 @@
     "name" : "George Best",
     "phone" : "9482442",
     "email" : "anna@example.com",
+    "faculty": "Computing",
     "venue" : "4th street",
     "module": "CS2102",
     "tags" : [ ]
diff --git a/src/test/data/JsonStaffBookStorageTest/invalidAndValidPersonStaffBook.json b/src/test/data/JsonStaffBookStorageTest/invalidAndValidPersonStaffBook.json
index 2b4b77d5195..1df05e4e195 100644
--- a/src/test/data/JsonStaffBookStorageTest/invalidAndValidPersonStaffBook.json
+++ b/src/test/data/JsonStaffBookStorageTest/invalidAndValidPersonStaffBook.json
@@ -3,12 +3,14 @@
     "name": "Valid Person",
     "phone": "9482424",
     "email": "hans@example.com",
+    "faculty": "Computing",
     "venue": "4th street",
     "module": "CS1101S"
   }, {
     "name": "Person With Invalid Phone Field",
     "phone": "948asdf2424",
     "email": "hans@example.com",
+    "faculty": "Computing",
     "venue": "4th street",
     "module": "CS1101S"
   } ]
diff --git a/src/test/data/JsonStaffBookStorageTest/invalidPersonStaffBook.json b/src/test/data/JsonStaffBookStorageTest/invalidPersonStaffBook.json
index b04b9e663aa..8a9aa16fc32 100644
--- a/src/test/data/JsonStaffBookStorageTest/invalidPersonStaffBook.json
+++ b/src/test/data/JsonStaffBookStorageTest/invalidPersonStaffBook.json
@@ -3,6 +3,7 @@
     "name": "Person with invalid name field: Ha!ns Mu@ster",
     "phone": "9482424",
     "email": "hans@example.com",
+    "faculty": "Computing",
     "venue": "4th street",
     "module": "CS1101S"
   } ]
diff --git a/src/test/java/staffconnect/logic/LogicManagerTest.java b/src/test/java/staffconnect/logic/LogicManagerTest.java
index 1e912b65c6c..2db9ffa494d 100644
--- a/src/test/java/staffconnect/logic/LogicManagerTest.java
+++ b/src/test/java/staffconnect/logic/LogicManagerTest.java
@@ -4,6 +4,7 @@
 import static staffconnect.logic.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
 import static staffconnect.logic.Messages.MESSAGE_UNKNOWN_COMMAND;
 import static staffconnect.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
+import static staffconnect.logic.commands.CommandTestUtil.FACULTY_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.MODULE_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.NAME_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
@@ -167,7 +168,7 @@ public void saveStaffBook(ReadOnlyStaffBook staffBook, Path filePath)
 
         // Triggers the saveStaffBook method by executing an add command
         String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY
-                + EMAIL_DESC_AMY + VENUE_DESC_AMY + MODULE_DESC_AMY;
+                + EMAIL_DESC_AMY + FACULTY_DESC_AMY + VENUE_DESC_AMY + MODULE_DESC_AMY;
         Person expectedPerson = new PersonBuilder(AMY).withTags().build();
         ModelManager expectedModel = new ModelManager();
         expectedModel.addPerson(expectedPerson);
diff --git a/src/test/java/staffconnect/logic/commands/CommandTestUtil.java b/src/test/java/staffconnect/logic/commands/CommandTestUtil.java
index 61b8216c5d8..f871bf0200e 100644
--- a/src/test/java/staffconnect/logic/commands/CommandTestUtil.java
+++ b/src/test/java/staffconnect/logic/commands/CommandTestUtil.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -33,6 +34,8 @@ public class CommandTestUtil {
     public static final String VALID_PHONE_BOB = "22222222";
     public static final String VALID_EMAIL_AMY = "amy@example.com";
     public static final String VALID_EMAIL_BOB = "bob@example.com";
+    public static final String VALID_FACULTY_AMY = "Computing";
+    public static final String VALID_FACULTY_BOB = "Science";
     public static final String VALID_VENUE_AMY = "Block 312, Amy Street 1";
     public static final String VALID_VENUE_BOB = "Block 123, Bobby Street 3";
     public static final String VALID_MODULE_AMY = "CS2103";
@@ -46,6 +49,8 @@ public class CommandTestUtil {
     public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB;
     public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY;
     public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
+    public static final String FACULTY_DESC_AMY = " " + PREFIX_FACULTY + VALID_FACULTY_AMY;
+    public static final String FACULTY_DESC_BOB = " " + PREFIX_FACULTY + VALID_FACULTY_BOB;
     public static final String VENUE_DESC_AMY = " " + PREFIX_VENUE + VALID_VENUE_AMY;
     public static final String VENUE_DESC_BOB = " " + PREFIX_VENUE + VALID_VENUE_BOB;
     public static final String MODULE_DESC_AMY = " " + PREFIX_MODULE + VALID_MODULE_AMY;
@@ -56,6 +61,7 @@ public class CommandTestUtil {
     public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
     public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
     public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
+    public static final String INVALID_FACULTY_DESC = " " + PREFIX_FACULTY + "faculty"; // must match a NUS faculty
     public static final String INVALID_VENUE_DESC = " " + PREFIX_VENUE; // empty string not allowed for venues
     public static final String INVALID_MODULE_DESC = " " + PREFIX_MODULE; // empty string not allowed for modules
     public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
@@ -68,11 +74,13 @@ public class CommandTestUtil {
 
     static {
         DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withVenue(VALID_VENUE_AMY)
-                .withModule(VALID_MODULE_AMY).withTags(VALID_TAG_FRIEND).build();
+                .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withFaculty(VALID_FACULTY_AMY)
+                .withVenue(VALID_VENUE_AMY).withModule(VALID_MODULE_AMY).withTags(VALID_TAG_FRIEND)
+                .build();
         DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withVenue(VALID_VENUE_BOB)
-                .withModule(VALID_MODULE_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withFaculty(VALID_FACULTY_BOB)
+                .withVenue(VALID_VENUE_BOB).withModule(VALID_MODULE_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
+                .build();
     }
 
     /**
diff --git a/src/test/java/staffconnect/logic/commands/EditPersonDescriptorTest.java b/src/test/java/staffconnect/logic/commands/EditPersonDescriptorTest.java
index 6e780888358..aadbbb9012f 100644
--- a/src/test/java/staffconnect/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/staffconnect/logic/commands/EditPersonDescriptorTest.java
@@ -6,6 +6,7 @@
 import static staffconnect.logic.commands.CommandTestUtil.DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.DESC_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
@@ -49,6 +50,10 @@ public void equals() {
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
 
+        // different faculty -> returns false
+        editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withFaculty(VALID_FACULTY_BOB).build();
+        assertFalse(DESC_AMY.equals(editedAmy));
+
         // different venue -> returns false
         editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withVenue(VALID_VENUE_BOB).build();
         assertFalse(DESC_AMY.equals(editedAmy));
@@ -68,6 +73,7 @@ public void toStringMethod() {
         String expected = EditPersonDescriptor.class.getCanonicalName() + "{name="
                 + editPersonDescriptor.getName().orElse(null) + ", phone="
                 + editPersonDescriptor.getPhone().orElse(null) + ", email="
+                + editPersonDescriptor.getFaculty().orElse(null) + ", faculty="
                 + editPersonDescriptor.getEmail().orElse(null) + ", venue="
                 + editPersonDescriptor.getVenue().orElse(null) + ", module="
                 + editPersonDescriptor.getModule().orElse(null) + ", tags="
diff --git a/src/test/java/staffconnect/logic/parser/AddCommandParserTest.java b/src/test/java/staffconnect/logic/parser/AddCommandParserTest.java
index fd9038a98b9..f37f71856a9 100644
--- a/src/test/java/staffconnect/logic/parser/AddCommandParserTest.java
+++ b/src/test/java/staffconnect/logic/parser/AddCommandParserTest.java
@@ -3,7 +3,10 @@
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static staffconnect.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.FACULTY_DESC_AMY;
+import static staffconnect.logic.commands.CommandTestUtil.FACULTY_DESC_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
+import static staffconnect.logic.commands.CommandTestUtil.INVALID_FACULTY_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_MODULE_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
@@ -20,6 +23,7 @@
 import static staffconnect.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
 import static staffconnect.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
@@ -29,6 +33,7 @@
 import static staffconnect.logic.commands.CommandTestUtil.VENUE_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VENUE_DESC_BOB;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -43,6 +48,7 @@
 import staffconnect.logic.Messages;
 import staffconnect.logic.commands.AddCommand;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -60,21 +66,22 @@ public void parse_allFieldsPresent_success() {
 
         // whitespace only preamble
         assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+               + FACULTY_DESC_BOB + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_FRIEND,
+                new AddCommand(expectedPerson));
 
         // multiple tags - all accepted
         Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
                 .build();
         assertParseSuccess(parser,
                 NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VENUE_DESC_BOB
-                        + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+                        + FACULTY_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 new AddCommand(expectedPersonMultipleTags));
     }
 
     @Test
     public void parse_repeatedNonTagValue_failure() {
-        String validExpectedPersonString = NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_FRIEND;
+        String validExpectedPersonString = NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VENUE_DESC_BOB
+                + FACULTY_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_FRIEND;
 
         // multiple names
         assertParseFailure(parser, NAME_DESC_AMY + validExpectedPersonString,
@@ -88,6 +95,10 @@ public void parse_repeatedNonTagValue_failure() {
         assertParseFailure(parser, EMAIL_DESC_AMY + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_EMAIL));
 
+        // multiple faculties
+        assertParseFailure(parser, FACULTY_DESC_AMY + validExpectedPersonString,
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_FACULTY));
+
         // multiple venues
         assertParseFailure(parser, VENUE_DESC_AMY + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_VENUE));
@@ -98,10 +109,10 @@ public void parse_repeatedNonTagValue_failure() {
 
         // multiple fields repeated
         assertParseFailure(parser,
-                validExpectedPersonString + PHONE_DESC_AMY + EMAIL_DESC_AMY + NAME_DESC_AMY
-                        + VENUE_DESC_AMY + MODULE_DESC_AMY + validExpectedPersonString,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_NAME, PREFIX_VENUE,
-                        PREFIX_EMAIL, PREFIX_PHONE, PREFIX_MODULE));
+                validExpectedPersonString + PHONE_DESC_AMY + EMAIL_DESC_AMY + FACULTY_DESC_AMY
+                        + NAME_DESC_AMY + VENUE_DESC_AMY + MODULE_DESC_AMY + validExpectedPersonString,
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_NAME, PREFIX_MODULE, PREFIX_FACULTY,
+                        PREFIX_VENUE, PREFIX_EMAIL, PREFIX_PHONE));
 
         // invalid value followed by valid value
 
@@ -117,6 +128,10 @@ public void parse_repeatedNonTagValue_failure() {
         assertParseFailure(parser, INVALID_PHONE_DESC + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
 
+        // invalid faculty
+        assertParseFailure(parser, INVALID_FACULTY_DESC + validExpectedPersonString,
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_FACULTY));
+
         // invalid venue
         assertParseFailure(parser, INVALID_VENUE_DESC + validExpectedPersonString,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_VENUE));
@@ -139,6 +154,10 @@ public void parse_repeatedNonTagValue_failure() {
         assertParseFailure(parser, validExpectedPersonString + INVALID_PHONE_DESC,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
 
+        // invalid faculty
+        assertParseFailure(parser, validExpectedPersonString + INVALID_FACULTY_DESC,
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_FACULTY));
+
         // invalid venue
         assertParseFailure(parser, validExpectedPersonString + INVALID_VENUE_DESC,
                 Messages.getErrorMessageForDuplicatePrefixes(PREFIX_VENUE));
@@ -152,8 +171,8 @@ public void parse_repeatedNonTagValue_failure() {
     public void parse_optionalFieldsMissing_success() {
         // zero tags
         Person expectedPerson = new PersonBuilder(AMY).withTags().build();
-        assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + VENUE_DESC_AMY + MODULE_DESC_AMY,
-                new AddCommand(expectedPerson));
+        assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + FACULTY_DESC_AMY
+                        + VENUE_DESC_AMY + MODULE_DESC_AMY, new AddCommand(expectedPerson));
     }
 
     @Test
@@ -161,32 +180,37 @@ public void parse_compulsoryFieldMissing_failure() {
         String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
 
         // missing name prefix
-        assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB,
                 expectedMessage);
 
         // missing phone prefix
-        assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB,
                 expectedMessage);
 
         // missing email prefix
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + FACULTY_DESC_BOB
+                + VENUE_DESC_BOB + MODULE_DESC_BOB,
+                expectedMessage);
+
+        // missing faculty prefix
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_FACULTY_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB,
                 expectedMessage);
 
         // missing venue prefix
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VALID_VENUE_BOB + MODULE_DESC_BOB,
                 expectedMessage);
 
         // missing module prefix
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VALID_VENUE_BOB + VALID_MODULE_BOB,
                 expectedMessage);
 
         // all prefixes missing
-        assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB
+        assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB + VALID_FACULTY_BOB
                 + VALID_VENUE_BOB + VALID_MODULE_BOB,
                 expectedMessage);
     }
@@ -194,43 +218,48 @@ public void parse_compulsoryFieldMissing_failure() {
     @Test
     public void parse_invalidValue_failure() {
         // invalid name
-        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 Name.MESSAGE_CONSTRAINTS);
 
         // invalid phone
-        assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 Phone.MESSAGE_CONSTRAINTS);
 
         // invalid email
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 Email.MESSAGE_CONSTRAINTS);
 
+        // invalid faculty
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_FACULTY_DESC
+                        + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+                Faculty.MESSAGE_CONSTRAINTS);
+
         // invalid venue
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + INVALID_VENUE_DESC + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
             Venue.MESSAGE_CONSTRAINTS);
 
         // invalid module
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + INVALID_MODULE_DESC + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 Module.MESSAGE_CONSTRAINTS);
 
         // invalid tag
-        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + VENUE_DESC_BOB + MODULE_DESC_BOB + INVALID_TAG_DESC + VALID_TAG_FRIEND,
                 Tag.MESSAGE_CONSTRAINTS);
 
         // two invalid values, only first invalid value reported
-        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB
+        assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB
                 + INVALID_VENUE_DESC + MODULE_DESC_BOB,
                 Name.MESSAGE_CONSTRAINTS);
 
         // non-empty preamble
         assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
-                + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+                + FACULTY_DESC_BOB + VENUE_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
                 String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
     }
 }
diff --git a/src/test/java/staffconnect/logic/parser/EditCommandParserTest.java b/src/test/java/staffconnect/logic/parser/EditCommandParserTest.java
index 2e4eeb4aa61..8319054d817 100644
--- a/src/test/java/staffconnect/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/staffconnect/logic/parser/EditCommandParserTest.java
@@ -3,7 +3,10 @@
 import static staffconnect.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static staffconnect.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.FACULTY_DESC_AMY;
+import static staffconnect.logic.commands.CommandTestUtil.FACULTY_DESC_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
+import static staffconnect.logic.commands.CommandTestUtil.INVALID_FACULTY_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_MODULE_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
 import static staffconnect.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
@@ -17,6 +20,7 @@
 import static staffconnect.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
 import static staffconnect.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_NAME_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
@@ -27,6 +31,7 @@
 import static staffconnect.logic.commands.CommandTestUtil.VENUE_DESC_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VENUE_DESC_BOB;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_TAG;
@@ -44,6 +49,7 @@
 import staffconnect.logic.commands.EditCommand;
 import staffconnect.logic.commands.EditCommand.EditPersonDescriptor;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Phone;
@@ -92,6 +98,8 @@ public void parse_invalidValue_failure() {
         assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
         assertParseFailure(parser, "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone
         assertParseFailure(parser, "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email
+        assertParseFailure(parser, "1" + INVALID_FACULTY_DESC,
+                Faculty.MESSAGE_CONSTRAINTS); // invalid faculty
         assertParseFailure(parser, "1" + INVALID_VENUE_DESC, Venue.MESSAGE_CONSTRAINTS); // invalid venue
         assertParseFailure(parser, "1" + INVALID_MODULE_DESC, Module.MESSAGE_CONSTRAINTS); // invalid module
         assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
@@ -106,7 +114,7 @@ public void parse_invalidValue_failure() {
         assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
 
         // multiple invalid values, but only the first invalid value is captured
-        assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC
+        assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_FACULTY_AMY
                 + VALID_VENUE_AMY + VALID_PHONE_AMY + VALID_MODULE_AMY,
                 Name.MESSAGE_CONSTRAINTS);
     }
@@ -114,12 +122,16 @@ public void parse_invalidValue_failure() {
     @Test
     public void parse_allFieldsSpecified_success() {
         Index targetIndex = INDEX_SECOND_PERSON;
-        String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
-                + EMAIL_DESC_AMY + VENUE_DESC_AMY + NAME_DESC_AMY + MODULE_DESC_AMY + TAG_DESC_FRIEND;
+        String userInput = targetIndex.getOneBased()
+                + PHONE_DESC_BOB + TAG_DESC_HUSBAND
+                + EMAIL_DESC_AMY + FACULTY_DESC_AMY
+                + VENUE_DESC_AMY + NAME_DESC_AMY
+                + MODULE_DESC_AMY + TAG_DESC_FRIEND;
 
         EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
-                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withVenue(VALID_VENUE_AMY)
-                .withModule(VALID_MODULE_AMY).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+                .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withFaculty(VALID_FACULTY_AMY)
+                .withVenue(VALID_VENUE_AMY).withModule(VALID_MODULE_AMY)
+                .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
         EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
 
         assertParseSuccess(parser, userInput, expectedCommand);
@@ -158,6 +170,12 @@ public void parse_oneFieldSpecified_success() {
         expectedCommand = new EditCommand(targetIndex, descriptor);
         assertParseSuccess(parser, userInput, expectedCommand);
 
+        // faculty
+        userInput = targetIndex.getOneBased() + FACULTY_DESC_AMY;
+        descriptor = new EditPersonDescriptorBuilder().withFaculty(VALID_FACULTY_AMY).build();
+        expectedCommand = new EditCommand(targetIndex, descriptor);
+        assertParseSuccess(parser, userInput, expectedCommand);
+
         // venue
         userInput = targetIndex.getOneBased() + VENUE_DESC_AMY;
         descriptor = new EditPersonDescriptorBuilder().withVenue(VALID_VENUE_AMY).build();
@@ -194,23 +212,24 @@ public void parse_multipleRepeatedFields_failure() {
         assertParseFailure(parser, userInput, Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE));
 
         // mulltiple valid fields repeated
-        userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + VENUE_DESC_AMY + EMAIL_DESC_AMY
+        userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + VENUE_DESC_AMY + EMAIL_DESC_AMY + FACULTY_DESC_AMY
                 + MODULE_DESC_AMY + TAG_DESC_FRIEND + PHONE_DESC_AMY + VENUE_DESC_AMY
-                + EMAIL_DESC_AMY + MODULE_DESC_AMY + TAG_DESC_FRIEND + PHONE_DESC_BOB
-                + VENUE_DESC_BOB + EMAIL_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND;
+                + EMAIL_DESC_AMY + FACULTY_DESC_AMY + MODULE_DESC_AMY + TAG_DESC_FRIEND + PHONE_DESC_BOB
+                + VENUE_DESC_BOB + EMAIL_DESC_BOB + FACULTY_DESC_BOB + MODULE_DESC_BOB + TAG_DESC_HUSBAND;
 
         assertParseFailure(parser, userInput,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL,
-                    PREFIX_VENUE, PREFIX_MODULE));
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
+                        PREFIX_VENUE, PREFIX_MODULE));
 
         // multiple invalid values
         userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + INVALID_VENUE_DESC
-                + INVALID_EMAIL_DESC + INVALID_MODULE_DESC + INVALID_PHONE_DESC + INVALID_VENUE_DESC
-                + INVALID_EMAIL_DESC + INVALID_MODULE_DESC;
+                + INVALID_EMAIL_DESC + INVALID_FACULTY_DESC + INVALID_MODULE_DESC
+                + INVALID_PHONE_DESC + INVALID_VENUE_DESC
+                + INVALID_EMAIL_DESC + INVALID_FACULTY_DESC + INVALID_MODULE_DESC;
 
         assertParseFailure(parser, userInput,
-                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL,
-                    PREFIX_VENUE, PREFIX_MODULE));
+                Messages.getErrorMessageForDuplicatePrefixes(PREFIX_PHONE, PREFIX_EMAIL, PREFIX_FACULTY,
+                        PREFIX_VENUE, PREFIX_MODULE));
     }
 
     @Test
diff --git a/src/test/java/staffconnect/logic/parser/ParserUtilTest.java b/src/test/java/staffconnect/logic/parser/ParserUtilTest.java
index 046b3578d83..a0124e6de00 100644
--- a/src/test/java/staffconnect/logic/parser/ParserUtilTest.java
+++ b/src/test/java/staffconnect/logic/parser/ParserUtilTest.java
@@ -15,6 +15,7 @@
 
 import staffconnect.logic.parser.exceptions.ParseException;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Phone;
@@ -24,14 +25,16 @@
 public class ParserUtilTest {
     private static final String INVALID_NAME = "R@chel";
     private static final String INVALID_PHONE = "+651234";
+    private static final String INVALID_EMAIL = "example.com";
+    private static final String INVALID_FACULTY = "faculty";
     private static final String INVALID_VENUE = " ";
     private static final String INVALID_MODULE = " ";
-    private static final String INVALID_EMAIL = "example.com";
     private static final String INVALID_TAG = "#friend";
 
     private static final String VALID_NAME = "Rachel Walker";
     private static final String VALID_PHONE = "123456";
     private static final String VALID_EMAIL = "rachel@example.com";
+    private static final String VALID_FACULTY = "Computing";
     private static final String VALID_VENUE = "123 Main Street #0505";
     private static final String VALID_MODULE = "CS2103";
     private static final String VALID_TAG_1 = "friend";
@@ -128,6 +131,29 @@ public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exc
         assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
     }
 
+    @Test
+    public void parseFaculty_null_throwsNullPointerException() {
+        assertThrows(NullPointerException.class, () -> ParserUtil.parseFaculty((String) null));
+    }
+
+    @Test
+    public void parseFaculty_invalidValue_throwsParseException() {
+        assertThrows(ParseException.class, () -> ParserUtil.parseFaculty(INVALID_FACULTY));
+    }
+
+    @Test
+    public void parseFaculty_validValueWithoutWhitespace_returnsFaculty() throws Exception {
+        Faculty expectedFaculty = new Faculty(VALID_FACULTY);
+        assertEquals(expectedFaculty, ParserUtil.parseFaculty(VALID_FACULTY));
+    }
+
+    @Test
+    public void parseFaculty_validValueWithWhitespace_returnsTrimmedFaculty() throws Exception {
+        String facultyWithWhitespace = WHITESPACE + VALID_FACULTY + WHITESPACE;
+        Faculty expectedFaculty = new Faculty(VALID_FACULTY);
+        assertEquals(expectedFaculty, ParserUtil.parseFaculty(facultyWithWhitespace));
+    }
+
     @Test
     public void parseVenue_null_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () -> ParserUtil.parseVenue((String) null));
diff --git a/src/test/java/staffconnect/model/person/PersonTest.java b/src/test/java/staffconnect/model/person/PersonTest.java
index 6d195eb7e81..32c3a407d1f 100644
--- a/src/test/java/staffconnect/model/person/PersonTest.java
+++ b/src/test/java/staffconnect/model/person/PersonTest.java
@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
@@ -35,7 +36,8 @@ public void isSamePerson() {
 
         // same name, all other attributes different -> returns true
         Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
-                .withVenue(VALID_VENUE_BOB).withModule(VALID_MODULE_BOB).withTags(VALID_TAG_HUSBAND).build();
+                .withFaculty(VALID_FACULTY_BOB).withVenue(VALID_VENUE_BOB).withModule(VALID_MODULE_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSamePerson(editedAlice));
 
         // different name, all other attributes same -> returns false
@@ -82,6 +84,10 @@ public void equals() {
         editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).build();
         assertFalse(ALICE.equals(editedAlice));
 
+        // different faculty -> returns false
+        editedAlice = new PersonBuilder(ALICE).withFaculty(VALID_FACULTY_BOB).build();
+        assertFalse(ALICE.equals(editedAlice));
+
         // different venue -> returns false
         editedAlice = new PersonBuilder(ALICE).withVenue(VALID_VENUE_BOB).build();
         assertFalse(ALICE.equals(editedAlice));
@@ -98,7 +104,8 @@ public void equals() {
     @Test
     public void toStringMethod() {
         String expected = Person.class.getCanonicalName() + "{name=" + ALICE.getName() + ", phone=" + ALICE.getPhone()
-                + ", email=" + ALICE.getEmail() + ", venue=" + ALICE.getVenue() + ", module=" + ALICE.getModule()
+                + ", email=" + ALICE.getEmail() + ", faculty=" + ALICE.getFaculty()
+                + ", venue=" + ALICE.getVenue() + ", module=" + ALICE.getModule()
                 + ", tags=" + ALICE.getTags() + "}";
         assertEquals(expected, ALICE.toString());
     }
diff --git a/src/test/java/staffconnect/storage/JsonAdaptedPersonTest.java b/src/test/java/staffconnect/storage/JsonAdaptedPersonTest.java
index 27e0e4f8df8..e5fb6c97aab 100644
--- a/src/test/java/staffconnect/storage/JsonAdaptedPersonTest.java
+++ b/src/test/java/staffconnect/storage/JsonAdaptedPersonTest.java
@@ -13,6 +13,7 @@
 
 import staffconnect.commons.exceptions.IllegalValueException;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Phone;
@@ -22,6 +23,7 @@ public class JsonAdaptedPersonTest {
     private static final String INVALID_NAME = "R@chel";
     private static final String INVALID_PHONE = "+651234";
     private static final String INVALID_EMAIL = "example.com";
+    private static final String INVALID_FACULTY = "faculty";
     private static final String INVALID_VENUE = " ";
     private static final String INVALID_MODULE = " ";
     private static final String INVALID_TAG = "#friend";
@@ -29,6 +31,7 @@ public class JsonAdaptedPersonTest {
     private static final String VALID_NAME = BENSON.getName().toString();
     private static final String VALID_PHONE = BENSON.getPhone().toString();
     private static final String VALID_EMAIL = BENSON.getEmail().toString();
+    private static final String VALID_FACULTY = BENSON.getFaculty().toString();
     private static final String VALID_VENUE = BENSON.getVenue().toString();
     private static final String VALID_MODULE = BENSON.getModule().toString();
     private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
@@ -44,7 +47,7 @@ public void toModelType_validPersonDetails_returnsPerson() throws Exception {
     @Test
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = Name.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -52,7 +55,7 @@ public void toModelType_invalidName_throwsIllegalValueException() {
     @Test
     public void toModelType_nullName_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -60,7 +63,7 @@ public void toModelType_nullName_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidPhone_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -68,7 +71,7 @@ public void toModelType_invalidPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_nullPhone_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -76,7 +79,7 @@ public void toModelType_nullPhone_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = Email.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -84,15 +87,31 @@ public void toModelType_invalidEmail_throwsIllegalValueException() {
     @Test
     public void toModelType_nullEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null,
-                VALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
 
+    @Test
+    public void toModelType_invalidFaculty_throwsIllegalValueException() {
+        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
+                INVALID_FACULTY, VALID_VENUE, VALID_MODULE, VALID_TAGS);
+        String expectedMessage = Faculty.MESSAGE_CONSTRAINTS;
+        assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
+    }
+
+    @Test
+    public void toModelType_nullFaculty_throwsIllegalValueException() {
+        JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
+                null, VALID_VENUE, VALID_MODULE, VALID_TAGS);
+        String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Faculty.class.getSimpleName());
+        assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
+    }
+
     @Test
     public void toModelType_invalidVenue_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
-                INVALID_VENUE, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, INVALID_VENUE, VALID_MODULE, VALID_TAGS);
         String expectedMessage = Venue.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -100,7 +119,7 @@ public void toModelType_invalidVenue_throwsIllegalValueException() {
     @Test
     public void toModelType_nullVenue_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
-                null, VALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, null, VALID_MODULE, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Venue.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -108,7 +127,7 @@ public void toModelType_nullVenue_throwsIllegalValueException() {
     @Test
     public void toModelType_invalidModule_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, INVALID_MODULE, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, INVALID_MODULE, VALID_TAGS);
         String expectedMessage = Module.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -116,7 +135,7 @@ public void toModelType_invalidModule_throwsIllegalValueException() {
     @Test
     public void toModelType_nullModule_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, null, VALID_TAGS);
+                VALID_FACULTY, VALID_VENUE, null, VALID_TAGS);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Module.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -126,7 +145,7 @@ public void toModelType_invalidTags_throwsIllegalValueException() {
         List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL,
-                VALID_VENUE, VALID_MODULE, invalidTags);
+                VALID_FACULTY, VALID_VENUE, VALID_MODULE, invalidTags);
         assertThrows(IllegalValueException.class, person::toModelType);
     }
 
diff --git a/src/test/java/staffconnect/testutil/EditPersonDescriptorBuilder.java b/src/test/java/staffconnect/testutil/EditPersonDescriptorBuilder.java
index 0929f713762..4a557f915da 100644
--- a/src/test/java/staffconnect/testutil/EditPersonDescriptorBuilder.java
+++ b/src/test/java/staffconnect/testutil/EditPersonDescriptorBuilder.java
@@ -6,6 +6,7 @@
 
 import staffconnect.logic.commands.EditCommand.EditPersonDescriptor;
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -36,6 +37,7 @@ public EditPersonDescriptorBuilder(Person person) {
         descriptor.setName(person.getName());
         descriptor.setPhone(person.getPhone());
         descriptor.setEmail(person.getEmail());
+        descriptor.setFaculty(person.getFaculty());
         descriptor.setVenue(person.getVenue());
         descriptor.setModule(person.getModule());
         descriptor.setTags(person.getTags());
@@ -65,6 +67,14 @@ public EditPersonDescriptorBuilder withEmail(String email) {
         return this;
     }
 
+    /**
+     * Sets the {@code Faculty} of the {@code EditPersonDescriptor} that we are building.
+     */
+    public EditPersonDescriptorBuilder withFaculty(String faculty) {
+        descriptor.setFaculty(new Faculty(faculty));
+        return this;
+    }
+
     /**
      * Sets the {@code Venue} of the {@code EditPersonDescriptor} that we are building.
      */
diff --git a/src/test/java/staffconnect/testutil/PersonBuilder.java b/src/test/java/staffconnect/testutil/PersonBuilder.java
index 070f4197947..8f231940065 100644
--- a/src/test/java/staffconnect/testutil/PersonBuilder.java
+++ b/src/test/java/staffconnect/testutil/PersonBuilder.java
@@ -4,6 +4,7 @@
 import java.util.Set;
 
 import staffconnect.model.person.Email;
+import staffconnect.model.person.Faculty;
 import staffconnect.model.person.Module;
 import staffconnect.model.person.Name;
 import staffconnect.model.person.Person;
@@ -19,6 +20,7 @@ public class PersonBuilder {
 
     public static final String DEFAULT_NAME = "Amy Bee";
     public static final String DEFAULT_PHONE = "85355255";
+    public static final String DEFAULT_FACULTY = "Computing";
     public static final String DEFAULT_EMAIL = "amy@gmail.com";
     public static final String DEFAULT_VENUE = "123, Jurong West Ave 6, #08-111";
     public static final String DEFAULT_MODULE = "CS2103T";
@@ -26,6 +28,7 @@ public class PersonBuilder {
     private Name name;
     private Phone phone;
     private Email email;
+    private Faculty faculty;
     private Venue venue;
     private Module module;
     private Set<Tag> tags;
@@ -37,6 +40,7 @@ public PersonBuilder() {
         name = new Name(DEFAULT_NAME);
         phone = new Phone(DEFAULT_PHONE);
         email = new Email(DEFAULT_EMAIL);
+        faculty = new Faculty(DEFAULT_FACULTY);
         venue = new Venue(DEFAULT_VENUE);
         module = new Module(DEFAULT_MODULE);
         tags = new HashSet<>();
@@ -49,6 +53,7 @@ public PersonBuilder(Person personToCopy) {
         name = personToCopy.getName();
         phone = personToCopy.getPhone();
         email = personToCopy.getEmail();
+        faculty = personToCopy.getFaculty();
         venue = personToCopy.getVenue();
         module = personToCopy.getModule();
         tags = new HashSet<>(personToCopy.getTags());
@@ -78,6 +83,14 @@ public PersonBuilder withEmail(String email) {
         return this;
     }
 
+    /**
+     * Sets the {@code Faculty} of the {@code Person} that we are building.
+     */
+    public PersonBuilder withFaculty(String faculty) {
+        this.faculty = new Faculty(faculty);
+        return this;
+    }
+
     /**
      * Sets the {@code Venue} of the {@code Person} that we are building.
      */
@@ -103,7 +116,7 @@ public PersonBuilder withTags(String ... tags) {
     }
 
     public Person build() {
-        return new Person(name, phone, email, venue, module, tags);
+        return new Person(name, phone, email, faculty, venue, module, tags);
     }
 
 }
diff --git a/src/test/java/staffconnect/testutil/PersonUtil.java b/src/test/java/staffconnect/testutil/PersonUtil.java
index 5229010d888..264a3ba39db 100644
--- a/src/test/java/staffconnect/testutil/PersonUtil.java
+++ b/src/test/java/staffconnect/testutil/PersonUtil.java
@@ -1,6 +1,7 @@
 package staffconnect.testutil;
 
 import static staffconnect.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static staffconnect.logic.parser.CliSyntax.PREFIX_FACULTY;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_MODULE;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_NAME;
 import static staffconnect.logic.parser.CliSyntax.PREFIX_PHONE;
@@ -34,6 +35,7 @@ public static String getPersonDetails(Person person) {
         sb.append(PREFIX_NAME + person.getName().fullName + " ");
         sb.append(PREFIX_PHONE + person.getPhone().value + " ");
         sb.append(PREFIX_EMAIL + person.getEmail().value + " ");
+        sb.append(PREFIX_FACULTY + person.getFaculty().toString() + " ");
         sb.append(PREFIX_VENUE + person.getVenue().value + " ");
         sb.append(PREFIX_MODULE + person.getModule().value + " ");
         person.getTags().stream().forEach(
@@ -50,6 +52,7 @@ public static String getEditPersonDescriptorDetails(EditPersonDescriptor descrip
         descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
         descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
         descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
+        descriptor.getFaculty().ifPresent(faculty -> sb.append(PREFIX_FACULTY).append(faculty.value).append(" "));
         descriptor.getVenue().ifPresent(venue -> sb.append(PREFIX_VENUE).append(venue.value).append(" "));
         descriptor.getModule().ifPresent(module -> sb.append(PREFIX_MODULE).append(module.value).append(" "));
         if (descriptor.getTags().isPresent()) {
diff --git a/src/test/java/staffconnect/testutil/TypicalPersons.java b/src/test/java/staffconnect/testutil/TypicalPersons.java
index 55658e0c179..e45ccf46abf 100644
--- a/src/test/java/staffconnect/testutil/TypicalPersons.java
+++ b/src/test/java/staffconnect/testutil/TypicalPersons.java
@@ -2,6 +2,8 @@
 
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_AMY;
+import static staffconnect.logic.commands.CommandTestUtil.VALID_FACULTY_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_AMY;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_MODULE_BOB;
 import static staffconnect.logic.commands.CommandTestUtil.VALID_NAME_AMY;
@@ -27,36 +29,45 @@ public class TypicalPersons {
 
     public static final Person ALICE = new PersonBuilder().withName("Alice Pauline")
             .withVenue("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
-            .withPhone("94351253").withModule("CS1101S")
+            .withFaculty("Computing").withPhone("94351253").withModule("CS1101S")
             .withTags("friends").build();
     public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
-            .withVenue("311, Clementi Ave 2, #02-25")
-            .withEmail("johnd@example.com").withPhone("98765432").withModule("CS1231S")
+            .withVenue("311, Clementi Ave 2, #02-25").withEmail("johnd@example.com")
+            .withFaculty("Computing").withPhone("98765432").withModule("CS1231S")
             .withTags("owesMoney", "friends").build();
     public static final Person CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
-            .withEmail("heinz@example.com").withVenue("wall street").withModule("CS2030S").build();
+            .withEmail("heinz@example.com").withFaculty("Computing")
+            .withVenue("wall street").withModule("CS2030S").build();
     public static final Person DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
-            .withEmail("cornelia@example.com").withVenue("10th street").withModule("CS2040S")
+            .withEmail("cornelia@example.com").withFaculty("Computing")
+            .withVenue("10th street").withModule("CS2040S")
             .withTags("friends").build();
     public static final Person ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
-            .withEmail("werner@example.com").withVenue("michegan ave").withModule("CS2100").build();
+            .withEmail("werner@example.com").withFaculty("Computing")
+            .withVenue("michegan ave").withModule("CS2100").build();
     public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
-            .withEmail("lydia@example.com").withVenue("little tokyo").withModule("CS2101").build();
+            .withEmail("lydia@example.com").withFaculty("Computing")
+            .withVenue("little tokyo").withModule("CS2101").build();
     public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
-            .withEmail("anna@example.com").withVenue("4th street").withModule("CS2102").build();
+            .withEmail("anna@example.com").withFaculty("Computing")
+            .withVenue("4th street").withModule("CS2102").build();
 
     // Manually added
     public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
-            .withEmail("stefan@example.com").withVenue("little india").withModule("CS2103").build();
+            .withEmail("stefan@example.com").withFaculty("Computing")
+            .withVenue("little india").withModule("CS2103").build();
     public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
-            .withEmail("hans@example.com").withVenue("chicago ave").withModule("CS2103T").build();
+            .withEmail("hans@example.com").withFaculty("Computing")
+            .withVenue("chicago ave").withModule("CS2103T").build();
 
     // Manually added - Person's details found in {@code CommandTestUtil}
     public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
-            .withEmail(VALID_EMAIL_AMY).withVenue(VALID_VENUE_AMY).withModule(VALID_MODULE_AMY)
+            .withEmail(VALID_EMAIL_AMY).withFaculty(VALID_FACULTY_AMY)
+            .withVenue(VALID_VENUE_AMY).withModule(VALID_MODULE_AMY)
             .withTags(VALID_TAG_FRIEND).build();
     public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
-            .withEmail(VALID_EMAIL_BOB).withVenue(VALID_VENUE_BOB).withModule(VALID_MODULE_BOB)
+            .withEmail(VALID_EMAIL_BOB).withFaculty(VALID_FACULTY_BOB)
+            .withVenue(VALID_VENUE_BOB).withModule(VALID_MODULE_BOB)
             .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
 
     public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER