Added [add|remove]-mixin options