fixed organization schema