Switched to using a context class.