BS-7150 Update Organization Model and Code generated