Slight changes to schema