Added recursive entity builder