Making more robust to schema change
Closes #6