Added canvas mapping