Jarv/add hostname to common