Better error Handling, preparation for links to services and hosts