Fixed underscore missing with proxy type, added a missing import