--Added Client and Building Management--