Changes to use the organisation table