Wrote PID mapping
Make name mapping work