Added collections and helpers along with renaming imports