Schema efficiency improvements

closes #6
closes #7
closes #8