InjectData improved