Partial update of Supervisor class, switching over to a table format