Component and mixin was refactored