Multi tribunal separation

Changes to support multiple tribunals