(refactor) Updated to use mixin from Iron.