Small improvements to organization model.