Add more independence between modules