Change behavior and add functions for hostname