Rework to get rid of injection issues