Adding in collections and localStorage support