task 667, change dao and entity of organisations