Changed behaviour of collector to make API easier and added some more
docs