Add support / test for partial struct mapping