Added mapping table declaration