Add injection support, with some bugs