Browsing: contract restructure