add classes; add collection methods