Finish schema-issues