-changed elements to work directly with interfaces and not through class
proxies.