[arctic-wolf] - Complete colletion mixin
[arctic-wolf] - Refactor code