@wluyima @djazayeri Do we still need these mappings if we don't create corresponding tables in core?