Added some collecting functionality