Added viaIds option and switch to explicit injection.