Added logic for different types based on the office