Add new callback/blocks to Assistance Service; various fixes