Cleaned up history support