Second commit to address Apiary changes