MX-25 legacy support for departments added