Added address/host name mapping and additional filename formatting