Changes made for host functionality