Schema fixes
YOLO
Make indexing work