Removed full_path field