Final changes for Core