Added mapping and audio code