add more missing dependencies
changed namespace