Bug fixes on Department cause an impact on other files and I am update
the branch to reflect those changes