Changed Libraries and Building Services model to work on the new API