Fixed array pickling
Added support for further collection types

Also renamed a few classes.