Big reorg... Asynchronous injection!