replaced mixin object with BaseCommand