Updated version on ContextIO