Added matador scaffolding