seems like there’s a lot of complication in those mappings and i’m wondering if there may be a chance to simplify or if there’s some requirement i’m not clear on