Removed duplicates, added schema