More abstract changes.