(refactor) Refactored to use a single mixin trait.