Add some users and services
Resolve ambiguous dependencies