integrated action_mixin and fixes