Minor updates to schema - working ok now