Added Class inher for Path, fixed refs