Firm Management Update

* indicates required