Changed mixin API to match. Updated version