SITRACK-93 - Add supervisor and work location fields