Add setId and getFirm