Added context storage option, cleaned up.