Added generic item
Proxies, some commenting