Added host support and fixed owner for files