Added mapping output functionality