Added missing mapping types