Now using context files and os.path