Map Struct again

A fix for the previous push