Further updates to the sources based on Daniel Kruegler's fedback.
Provided better specs for HostSource, UserInfoSource etc.