Fix #97 Add the mentor field