Adds self links in collections
Change API for represent
Use string key, TODO: investigate
Remove left-over