Add var conversion to other handlers