More work on adding hosts