Incorporated changes from schema review