Apply new collecting modules

#10