Inproved delegation API