Added mapping file for Address and client