Added more mixin