Caixa spider refactor