The declarations builder and the collection classes were refined.