Added more libraries and more messages properties