Adding missing mixins and inverting the if clause
now using new mixins in the deprecated code