Added missing types and mapping values