#19 Map into existing instances