Some JavaDocs & Add CollectionUtil