Reworking architecture