Improve 4CaaSt context variables