Preparing support for client-side callbacks