Updated to collect-core 3.1.x. Made sure calculated attributes where ignored.