Includes more mappings