Add organisation_id to remaining models, update methods in models