Changes to support Apiary.io backend.