Updated collections. related to #15