More updates to Apiary to reflect changes in representation od data