Support for both schema versions (v2.6 and v2.7). Closes #11