small changes in proxy and delegator (extracted stuff into modules)