Improve collecting module

Related to #8