Extended support for the collection object to more methods, some bugfixes