Added mapping types