Yakus refactor. Added Collect field