Fixed host provider to be in sync with the new host resource definition. Also kept backward compatibility where it was possible.
Small fix with host resource update
Merge conflict resolution