Add forward + renaming stuff