> inject these things and move

I thought about it but I didn't wanted to change the interface but at same point it has be done anyway, so I could also be done now.