Finished Proxy Definitions. Sets not yet updated to new properties.