Reworked architecture